Updated tests to fit new models. Removed trims
Added constraints as of new model relations
Added more info to ally and enemy columns
Added trim to return to make sure there are no trailing spaces
Added trim() to String setters
Align to new models