refactor the tests and attempt to test that error keys are always updated for staging  but only for marketing releases in production...as agreed with @tomprince
refactor the tests and attempt to test that error keys are always updated for staging  but only for marketing releases in production...as agreed with @tomprince

LaynePeng/flocker,achanda/flocker,adamtheturtle/flocker,moypray/flocker,mbrukman/flocker,Azulinho/flocker,AndyHuu/flocker,w4ngyi/flocker,achanda/flocker,agonzalezro/flocker,w4ngyi/flocker,wallnerryan/flocker-profiles,AndyHuu/flocker,adamtheturtle/flocker,hackday-profilers/flocker,achanda/flocker,hackday-profilers/flocker,hackday-profilers/flocker,lukemarsden/flocker,mbrukman/flocker,agonzalezro/flocker,runcom/flocker,LaynePeng/flocker,w4ngyi/flocker,1d4Nf6/flocker,runcom/flocker,wallnerryan/flocker-profiles,1d4Nf6/flocker,jml/flocker,jml/flocker,Azulinho/flocker,mbrukman/flocker,1d4Nf6/flocker,runcom/flocker,moypray/flocker,wallnerryan/flocker-profiles,lukemarsden/flocker,jml/flocker,adamtheturtle/flocker,AndyHuu/flocker,LaynePeng/flocker,lukemarsden/flocker,Azulinho/flocker,agonzalezro/flocker,moypray/flocker