Merged in changes from inkwell work and added a bunch of tests