Made changes to make tests work