@embray - ah I see - but do you still agree that it's fine/cleaner to just do it at testing time?