Feature clean tests

Just cleaned the tests a bit (removed old test, added 2 more tests).