One small memory leak fix, the others are test assertion improvements or code readability improvements.