Making tests

Resolving issue #2