Create files more intelligently
Ignore synchronization issue by simplifying test