Further changes to test base to support mocked http session