Moving to unit test framework