remove filesystem, use filehelper trait
fix tests