fix test
Single config file
Fix listeners
Fix listeners