State2 -> Fix initialization issue with Photocells and other device objects.  Add additional test to cover this scenario.