Comment corrections
Add unit tests