Made updates from team
devtest to test for BS parity