ARMORY-104 Fix a bunch of unit tests so that they work together