Make the tests run for both burp2 and burp1, and tidy them a lot.