Added remaining tests.