Fixed CLI specs