(chore) Add missing spec tests for new classes; Refactor usage to not use model passed by reference as this is not allowed by phpspec (by design) - #616