Beefing up tests
Beefing up tests