Drop not used parameters
Correct counting on suggestion accept/delete
Complete tests for suggestion handling