Refactored fs to us fsUtil everywhere
Test cleanup