More tests, and one bug subsequently squashed! MWAHAHA, I feel mad with testing!