Adds unit, scale to serializer. Implemnts test for it