BS-8940,add tests