Add missing files in previous commit + a new test.