simplify tests a bit
add wait param
fix up API docs a bit