Refactoring tests into the correct folder.

Creating a base test class