Added better tests for instantiations and associations