JC: All rspec passes with revised authentify and right mechanism