A bit of cleaning up. Added a unit tests project.