test and annotation fixes