#11 Unit tests added.