Merge "Tidy up Console, fix ConsoleTest"