More updates for Shrine creation testing.