Add counter collection and ensure sorting by true insertion order.
Remove incorrect option from test
Add make recipe to clean up test databases