tweaking test infrastructure