Fixed breakages in the test suite - was using static constructor on non-proxied classes