Merge "Refactor GroupServletTest to use DB"