Update test generator to use the new spec
Update funkit