Add base tests

Add some base tests.

Also:
Fixes #4