Added fs tests