Staging - new dev on WS238

* new testing templates
* template fixes for 238