Changes after tests, to fit those.