Simplified tests, reduced duplication