refactored tests to make it easier
merged