Fixing test and adding CBS properties