comments and additional tests