Bugfixing, new testing scenarios