[CODE] Finish tests

[agamm]

** What is the problem? **
Tests are not >90% covered, and tests impact the global comeback entries (need to add a remove entries function to restore the state after the tests).

May the force be with you.