updates to make tests work