Add a couple more tests
Add some more tests and validation
Fix a broken test
Fix some tests
Get coverage to 100%