Updates to make this work on infoTest
Added missing files