Added tests, did TODO, applied review, fixed bugs, etc.
Tweaks.