Additional tweaks for running full test suite