Fixes for unit tests.  Revert flip-bound logic.