Support dots in filenames, add more complex tests