ARMORY-104 Broken Unit Tests