close to done with cmd tests