Removed wisper and mocks
More decoupled tests
Bringing back the events