Further consolidated the tests