Renamed variabls / reworked tests to be more like documented counterparts