Made minor changes to test