Split a few files up.
Use a more idomatic test for interface satisfaction.
Add more documentation for filestorage.