Filling out remaining tests.