I will rework all tests to use listeners