Try to clean up Inbox/Transaction/Conversation controllers
Fixed some broken tests