improving PB/SW test
improving PB/SW test