NoWait test, code cleanup