Cleaned up expects()
Fixed client peer name