Fix tests, didn't run them before last fix.