comments and more tests