Update comments and tests