Replace old photon tests with new ones.
Merge pull request #1033 from scotchfield/photon_tests

Replace old photon tests with new ones.