Added a load of tests