change check logic before rspec test (both controller test & model test)
Merge remote-tracking branch 'remotes/origin/ph4' into ph4_review