Removed some fields in tests