Fixed up dependencies and CLI test