Get Model and Controller tests working
Work In Progress