fixed current tests. CLI WIP still