Fix lint errors.
Start updating the waterfall mapper unit tests.