Bugfixing during test