Regarding integration test failures (uncategorized methods, no unused vars and co), I would like to fix them later to avoid conflicts on my other PRs