renaming, formatting, adding a few fields for tests