beef up the tests