Fix error in the acceptance tests
Merge branch 'service-unit-test' of https://github.com/Zerotech/tm into service-unit-test