Wrote some basic tests.
Merge branch 'add_tests'