gbp: More unit tests