manually merge files from master tests/ and tools/