Data saving tests

Still working on an issue where the data isn't being marshalled/un-marshalled correctly, due to naming schemas.