Add fixes.
Add unit tests and fix graders.