Closes #1170
* Restructure association import test fixtures * Add data-association + collaboration test cases Related to #638