Added some unit-tests around ordering of Klass.prepTree and Klass.prepNode calls