Simplified and clarified tests.