Final version of discount calculator with all tests added in