move listener tests to correct place