Add lots more tests