Replacing unit tests

Resolve #2