following up unit tests will add more tests and add proper listener to remove explicit delay