Updating mapper and track test to pass

@ndhoule