Fixed: py26's lack of assertIsInstance
Minor refactoring of test cases