updates for passing tests correctly