generalize tests so that they work with master nodes with different names, other than fake.os
generalize tests so that they work with master nodes with different names, other than fake.os