refactored the tests some more as part of ex 5