Don't clear the cache between each test step. Each test step relies on the cache being updated (or not) with the previous step within the test case.
Use "test" config during unit tests.
Merge branch 'develop' into ui/dev