streamline FileStorage a bit, add basic tests