Fixing failing tests
Better User-Agent name
Moving stuff to helpers/