Added test cases, fixed grammar, fixed percentages