Bug fixes while getting sanity to run
Merge pull request #461 from vedujoshi/test_parallelism

Bug fixes while getting sanity to run