Sabind/feature/adding tests

Adding some tests to start getting this stable.