Fixed tests again to fit PS behavior