Update comments and test