Fixed unit-tests for oUnit 2