add more fixtures and update tests