Step in the right direction of fixing the tests.