Fixed tests to work with event dispatcher.