adjusted the name of the discount calc function to avoid confusion
adjusted discount calculator name through the rest of the function
Created a test to make sure relative discounts were applied to the full item price