Bdcodr refinements and test consolidation