Replaced deprecated calls to failUnless with assertEqual