Improved tests and commented out wire listeners for more performance