Fixed tests to run with PS