Fixes for multi-timing, add unit tests for FB