3845 Associations ul and tests
3845 Test fix
Merge pull request #1692 from sarken/issue_3845

3845 Associations ul and tests