Fixed issues with tests