Refactoring: eliminate unneeded abstraction (STOX-9)
Improve testing mocking capability + expand test with delete (STOX-9)