Beef up some canon tests.