Some fixes on Gson tests