Remove Gson and add Test