Updated tests to work now we’re not depending on helpers any more