Some testing changes
Fix goroutine blocking problem
Fix goroutine blocking problem