Testing and modifications necessary for data scenario #7.