Fleshout the testing suite