Reverting for beta2

-Update importer with API changes in beta 2
-Temporarily disable equipment setup in test (failing one test), until
beta3's rename of setEquipmentSetupWithMap