Add back removeListener() and add a test for the lazy-instantiation