FIX/ENH: Update tests to match latest CLI Template structure