Refactor CLI testing

No more Aruba, no more singleton CLI