Fixed issues
Test changed