Added assertNotSame, other minor changes