Add more tests, fix BST deletion