more changes to make tests work.