refactoring
Merge remote-tracking branch 'refs/remotes/jesse-black/master' into develop
Fix refactorings breaking unit tests