Update test to use static class