fixed all the association tests; added a couple more tests