Merge "Adapt tests to FlickerLib refactoring"