Refactor tests to keep the folder structure of the project
Merge pull request #69 from jasonLaster/refactor-tests

Refactor tests to keep the folder structure of the project