Improving test program
new modification, now compiles, still need to refine PB/SW test