Fixes to run tests