Fixing tests broken by refactoring (tests required refactoring)