Fixed behavior and tests to match PS