Add much harder tests