Include the type of the puzzle when producing 'content' attribute
Added tests to attempt reading/writing from/to multiple formats