Bugfixing after integration into a project and fixing the tests