Complementary fix to #19 with inclusion.

Also updates integration tests to execute them quicker (single tmpDir
for all tests and use non-composite repository to speed up download).