[#5] Neatened up the test suite in preparation for adding more test cases.