More Data object tests & tiny changes to go along with them.