Improve fixture dir building script
Improve build_test_dir script