Beef up the tests