Additional comments and test