Reworked omniauthhash helpers into two classes and fixing relative tests; still not passing