remove printfs
set timeouts, update messages (because of branch name conflict)
fix test/expect