abstracted away model naming in tests and fixed emerging bugs