Draft4 test

Ok, I think I have all the old draft 3 tests converted, and added tests for the new draft 4 things. Any comments/ideas are welcomed.