Fixed issues with test