added refactored tests