updated tests to better conform with generator-bbb defaults