Checkpoint: updates to model/ and QueueTest