Add more files and tests.