Further extended tests and fixed subtle code identification bug they revealed.