refactored tests, should be functional now