REFACTOR: service events
TEST: add solo controller unit test