Removed some errors from the tests, added new constructors to some
classes to help with tests. Other people should probably take a look at
the tests to make sure that they are using the up to date means of doing
stuff and things.