quava testing cleanup