Work on fixing the tests after the console module refactoring.