Updated test helpers