Added extra tests and corrected an issue with loading from a File object that this brough to light.