fixies to get FGCP template tests working

cc @dkoper