Remove insertOneBasket method calls
Remove insertFiveBaskets method calls
More entities
Fix unit tests