WK-445 further annotations and tests