Correct count considering quantity. Added assert on test