- refactored tests