Update unit and integration tests
Refactor package and annotation names