Merging test fix in to master.