Tests

+ A more natural bimap definition