Adding code & test