Make tests pass without hardcoded DS.JSONSerializer

@wycats more cleanup, this time for serializer