Beefing up the tests