fixing bad test for #622 #620 #617
Merge branch 'master' into develop

* master:
  fixing bad test for #622 #620 #617