Ocd cleanup

This pull uses nosetests to run tests to ensure we fail (return code != 0) if any unit test fails.