more non-scalar complex type work + test cleanup for mongo