bson: simplified custom_test
Merge branch 'bson'