Bugfix unittests