Refixed unit test suite