Test manager, buffer clear fix