Adding argument captor
Merge branch 'fix/missing_gen_sources' into feature/gradle_support