CH-748: Changes and test fixes required for goals now being entities