add JUnit Test and delete some "throw exception"
Merge pull request #13 from zghaobac/develop

add JUnit Test and delete some "throw exception"