[JanisL]

Reading this makes me realize I had a bias against making lower level integration tests in this situation, definitely something I'll have to look for in the future.