Fix unit tests when using BP 2.1-alpha.

See #42.