Refactored Tests into tests folder.
Refactored Tests into tests folder.