Tidying up tests and adding PSAR Event functionality