Correct queue size check + proper tests