Reverted/Refactored some uses of the fixtures + changed the second assert to expect a scalar value instead of an array