* Fix issues with leaky binary index across tests * More rigorous binary_index reset as now other tests are failing :(