Don't require console-log4j in setup
Change use of addToCommands for finicky tests