Fix border/head option merging and uncomment the last of the tests.