This test code works as of 8/31