Nick O: Added some tests around various items with low coverage