Add lots of tests