Organized project and got tests setup