Improved sample info test
Tweak test for "is normal file"
Minor refactoring around data track loading for clarity:  Merge "preload" and "load" methods, name of method is now "load".
Merge remote-tracking branch: upstream/master