CHANGED: Refactoring of tests