modified script and added test dirs