Test improvements

Refactoring