refactored tests a little