Add some tests, etc.