a few renames in tests