Update & fix unit test system