Fix public to private on managemente of handlers.
Added JUnit Tests