Minor cleanup on goreland tests