Reorganized test to better error out and cleanup CTR
1 file changed