[WIP] Fig tests 

test run, regression test is handing.  very close to getting both working.