reenhanced/audited — pull request #1 by nhance (2012-10-05 18:09:32+00:00)
Title: Fixes tests

Fixes tests