Fixed / rewrote erroneous test
Merge branch 'master' into 'BS-9199_BusinessApp'