Fixed mismatched filename and variable ids found by Spout tests