Fix bug with Queue.size accessing wrong data

Had to do with the way that @data was populated differently
Update tests for bug fix