Fat bug fix in tests! Try to avoid private classes. They serialize
parent classes references too...