Test runner fixes