More improvements to testing console