modified the tests, hopefully they are right now