Unit-testing complete