Added a bunch of tests and schema