rework setup
fixes test setup