Remove BPCategoryTest while finding proper implemenation strategy