Adding user integration tests

I wasn't able to finish but we might as well get these in for now.