Beafed up the tests