Change folder name, add tests