Removed conflict code from previous merge
Enabled get item tests
Bug fixes for find_one and get item tests