Major update to fsbase-test