Copy files from Jack Hammer
Fix tests