Modified build-scripts to make few test cases run