New tests, starting work on file sync