@jcredding :boom: this is why you remove singletons - so much easier to test like this.