Simplified some tests