Finish arhitecture
Create test class