Rejigger serializer helper; add specs