Increasing test module heap to 2G was not a good idea
Merge remote-tracking branch 'github/master' into starling-maker