Fixing a couple of Sonar warnings, adding ITs

* Moving some duplicate code to a shared superclass
* Removing unreachable error handling
* Adding several ITs

Addresses https://www.pivotaltracker.com/story/show/70678842