Small changes needed to make test benches work