Made tests work with new pw