Additional changes

Forgot to commit these
Added Unit Test Project
More commits