Updates discussion tests to not mock out so much. Also adds new test coverage for the bug being investigated here.
