Added a slew of tests.