more debugging/preparation for unittests