refactored test structure and renamed project