Updated test suite and preparation for discount conditions