Added another test
Cleaned up tests