Changed names of tests to be consistent and changed the order so that similar tests are grouped together. Added more tests using the canonical data.