revert wait on save
change some tests