Fix tests
MR !152 (merged) introduced a circular dependency that was not discovered because the test return value was always zero.
MR !152 (merged) introduced a circular dependency that was not discovered because the test return value was always zero.