Strip this test down a bit