CBA test and implementation done