more dev test fixes
Merge pull request #1853 from naylor-b/refactor

more dev test fixes