Moving helpers to new directory
Moving test helpers into seperate folder