Added and modified several tests.