317 - refactored the tests