Tests are refactored - problems found