all unit tests working after removal of unneeded states and events, and simplification of discover handler