Refactoring of unit tests. Work in progress.