Actually tests still fail, 'fix' just masked this