updates for add't tests and PSR2