Fixed unit-tests (run: make test)