Two more tests (#4984, #4995)
Two more tests (#4984, #4995)

iand675/stackage,soenkehahn/stackage,simonmichael/stackage,clinty/stackage,stackbuilders/stackage,asr/stackage,jonschoning/stackage,Daniel-Diaz/stackage,mrkkrp/stackage,michalkonecny/stackage,massysett/stackage,athanclark/stackage,fpco/stackage