refactored single test