Tidied up JavaDoc comment.
Renamed CollectionItemTest to reflect class rename.
Simplified Exception handling.