Fixes for fb tests.
Merge pull request #63 from UCSD-PL/fb_fixes

Fixes for fb tests.