Fix poller test and refactor get from registry functionality