Tasks class swapped into declaring interface fixes #2
Tests: FileStorage test updated
Removed unused class import