Removing toString using GSON
Removing dummy tests
Making GSON non global field - adapting old code to this
Small but important change in cleanup order