fixed failing test cases, improved fs test cases