Fix tests. Remove unused Sharky fields.