Move files, add new tests