ws
more fixes for dev tests
Merge pull request #1852 from naylor-b/refactor

more fixes for dev test failures