Extended lazy dataset to allow shapes to be set that have ones appended
and added unit tests
Removed commented out old code and tightened up checks