Added more tests of API PS