Just before merging big changes from "turbo" branch

pre-turbo-merge

increase sleep as the test is fragile with the current value (#527)