Simplified the tests