PSv2 update

This is a relatively large update that mainly incorporates the PSv2 fixes and functionality from the module tests. This has been tested on a PSv1 and a PSv2. Also, this is merged with the ps_v2_new_worker branch from @yotarid.