Removed some models, made them attributes on the procedure.
Renamed fixtures so that they are easier to refer to