start of test fixes, more to come
test fixing ftw
more tests, tidying controllers
view fixes
Merge pull request #8 from kylesuss/test_fixes

whoa! great job on these tests!!!!!!