WIP: update mb_test to work with FS