Update fs test to new API