changes to make tests work