tests added + bugfixes, definition of complex_matchers_association changed