Refactoring

Renamed tests to match components on architectural diagram