Changes to CLI tool.
Re-enabled last test.