Added value_amount calculation; with tests for fixed and percentage