Added a number of tests.