Shaving a few more lines off the tests