Updating test project, and deleting ServiceLocator folder.
Fix on building association properties.
Updating test project.