Fixed HeaderBag tests.
Updated and fixed FileSystemStorage tests.
Final polish.