Refactored for 3 and 5 tests