fixup! Adjust tests to new implementation