Adapted CLI
Adapted old testsuite to reflect changes in AY profile.