Develop

I haven't done any work with the tests, so it's possible that some of them are now failing due to changes in naming and how certain methods are called.