Adding a whole bunch of tests