Make sure to listen on master
Add test for non-master case