Cleaned up vbmfmm and made tests.