Test cleanup: consistent access levels