Fixed tests to work with PS