More tests and minor bugfix (ServiceNotAvailableHandler vas not called
well)