assert fixes, add wait for