Add test and comments