Remove static class variable to make block easier to test