Fixing the unit test build following Rhiju's renaming; also fix Andrew Watkin's uninitialized variable warnings / errors.