Update tests, PDS glue scripts and controllers :tennis: