Fixed / rewrote erroneous test
Merge branch 'master' into 'BS-7282_BizData_Multiple'