Fixed tests to work with new rcpts push structure.