Refactored to use more descriptive nose.tools assertions