T10 Fixing tests in handlers package. Fixed