closes #369
...in an if after an if in the 2nd switch prong closes #355
rename self hosted tests to behavior tests