Updated tests (especially tests from jacky) to allow pax testing