Add some tests, more to go