Fix NumberListener, fixtures and add scenario