Fix #1168
Fixes in the way incremental build is managed at restart
Fix #1169 : explicitely add the repo bundle when running tests
Clean the test to avoid false failures