Fix tests, since code has moved around