Added unit test for SaxDefaultHandler and refactored SaxDefaultHandler