Made changes to remove depedency on custom fields used during testing.