Use the StlDS ListDS and fix typeos in CollectionsTest
Add header guards to FileDS and StlDS