Adding some tests

Leaving this out while I add more tests.