Improve TW2 engines detection and test units