Changed _id fields to string.  Modified unit test to use proper child records.
Adding merged files