update tests to pass and simplifiy fixture data