Fixed issues with tests.