Fixed cli tests - all were wrong, now pass.