Also, for that matter, maybe we need a spec/bin as well for cli tests, for better organization