Made couple of changes to the tests.