add bimap test along with bug fix/tweaks
3 files changed