Renamed Controller to Context. More Tests.