Rebase, apply the config in a test, comments  (Applied comments from pull/228 part 2)