some tests refactored for readability