#21 - Unit tests created, need to get them passing.