Encapsulated handler callback implementation to not be public API
Added test
Added jacoco coverage