Cleaned structure added tests
Cleaned structure