Add test and update project structure accordingly