adjustments due to unit tests