Implementing unit-test, WIP