Fix test suite failures
By merging tracker!254 (merged) without !202 I inadvertently broke the test suite. This pulls in the relevant fixes.
By merging tracker!254 (merged) without !202 I inadvertently broke the test suite. This pulls in the relevant fixes.