Adding tests for new association resolving stuff
Handle associations like a boss