Add some nastier test cases.