Add a load of test stubs, fix an annoying crashing bug - need to come up with a better way to register/unregister objects globally