A few more tests
More tests and sanity checks