Test scripts adapted to new directory structure.