Fixing tests
Naming tweaks