- Enhanced unit tests.
- Reformatted code.
- Added TODO for builder.