more unit-tests and problems with class variables.