Comments and extended tests