added test cases
Merge pull request #16 from junsumida/tests-refactoring

added test cases
Merge branch 'master' into 404/500