Add test and address comments