updates to enable better unit tests