Seperating helpers + adding unit tests