A few more files, a few more tests