Tidyup#
Picked up MockHttpContext from 2012 codebase