Tests with service mocks, event tests and cleanup etc.

Signed-off-by: Simon Bailey <simon@newtriks.com>