Revert "Revert "Update w/ test files""

This reverts commit 235b00cad213fd60f4ff045d42dc988e2c819dae.