making some changes to the tests so they work properly