controller and model tests and model fixes

Bill. Sweet sauce. Awesomeness. :thumbsup: