Adjustments for unit testing