PCT-562 clean up and new test