Added fishery and fisherman with associated tests. Updated existing code to handle these