Simplified test cases; refactored to make more clear