Comments and new tests