Fix various klass issues to get test framework running.