Filled in more tests.