Refactor tests to use non-clashing GAVs