Refactored tests for bst and dst