Added a large number of tests