Rename tests to follow new model naming scheme