ticket:3. Tests fixed