Add even more tests