Updates to tests; added explicit embedded documents.