Fixing the build to handle grid test cases
fixing the merge
new files