Refactored the tests and added new tests
Merge pull request #18 from NyaaTilde/refactor-tests

Refactored the tests and added new tests