Additional comments and tests