Updated tests to actually list count
Small code updates