Remove unused test file
Fix test cases
Merge pull request #7 from ww24/develop

Develop