Comments and more tests