Tests pass now with one more list(map()).