More flexibility in unit tests