reinstate static class, failing tests.