Simplified the tests a tiny wintsy bit.