Finalizing Unit-Tests
Merge pull request #1 from LucM/unit_test

Finalizing Unit-Tests