Updating tests to work from cli.