ST: BST bug fix

Attempt to revert commit and the fix for the BST error. Removed only on the test. 
Works locally. 

#27