Add Profiles
Refactoring TU and Integration Test