pco2w_abc and pco2w_abc_dcl fixes for bit flags and some minor test updates