Update tests for changes to B<>