Bugfixing, testing scenarios