Feature/unit testing

Expanded unit testing