Large changes to how test4 in bibulous_test.py\n\nNow that the unnecessary second call to generate_sortkey() inside bibulous.py is removed, the structure of this test had to change substantially in order to make the test work.
Minor modifications to test4 in th testing suite.