Fixed organization of helpers and connection test