Minor cleanup on metadata unit tests