ADmad's comments + method name + add exception test