Helpers revision + Add unit tests