moved some test/debugging code into a static class