Fix spelling test
Fix use of a condvar in the close method
Fix spacing/tabs
Fix test