All tests now passing except for the CLI tests.