Fix issue #4 and add base handler for issue #5. + Update tests data