Unit tests refactoring

Rename tests and test fixtures