Fix regressions caused by removing constructor for static class; update test cases