Our style settings don't like underscores in variable names, so I switched to camel case. Also, err was unused in some places, so I made an error a fail condition for some test.
Signed-off-by: Brice Rising <brice.rising@slalom.com>
(cherry picked from commit 3d15ec7125bff4a43f4da57225c88c086cbdf108)