marshalling formats
fix tests