Refs #77. AssertIsNone not available in python 2.6
Refs #77. Switched the variables
Refs #77. Fixed a bug