Make some tests a little cleaner