Address review comment: More through test.
Address review comment: More through test.

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