Add Status Summary Support and update tests.