Added punch call and related tests