Tests infrastructure changed to work with the way Gandalf is now being initialised