Cleaned up test (using assertTrue/assertFalse rather than assertEquals(true... etc.