Merge "Support for multiple tests" into gingerbread