had a test hang / working on a better testing solution