Add remaining tests.