More Droidbench test refactoring