parens per @drapergeek
clean up expectation messages

generates a clearer expectation message when things don't look right
generate controllers better and test more things

now we test the matchers more explicitly instead of just using them.