Further refactoring tests

* Still lots of tests failing due to refactor, have to get passing.