Also moved the map_err call to the end, which I think makes the function
a little easier to read

The tests will get large, so splitting them will be necessary anyways.