Added additional testing
Correctly throw exception when iterator has no more remaining
Extended test
Prevent null pointer exception