Adding files and tests