Changed tests to work with PS