port marshal_sqa to marhsal_django and add tests