Fixing tests
Refactor, renaming... reorganization