Added fixes to run all tests