Adding paths and refactoring tests.