Count calls to addHolder / removeHolder relatively

This way if implementation of some operation changes, tests only of that operation will need to be adjusted