Cleaned up cli-test a bit