Fixes to make tests run - #100

nikhilv wants to merge 2 commits into

Fixes to make tests run#100
nikhilv wants to merge 2 commits into
masterfrom
testFailures

Code changes to get tests to pass