Add some challenging tests