Switch to gson
fix tests