Add a ton to the tests and example