Updated ConsolePrinter and several unit tests