improvements to CharvaTest.java