Clean up some merging issues.
Update biosample behave test to allow one more primary cell.