...and fixed tests for the change