Changed more handler to new way including tests

Issue #1