Added static class and field unit tests