Getting the unit tests running again, in prep for SPOT-234