Added some challenging tests