Fix compile issues
Refactoring prep for tests

To get some bigger scale tests working, I needed a good way to test the
marshalling process.  For this I made it so that I can easily compare binary
output to binary content in files.