wrote the rest of the integration tests
still working relationships
Add integration tests, slowly
down to the last two
fixed merge conflict
all relationships working