Moved into root folder
Writing tests