Simplified and cleaned up existing tests.