stable with wait on queue side, unit tests need clean up