Fixed test fails
Bit of a tidy up
Merge pull request #1 from stucox/851-todataurl

Fixed test fails