Fixed tests part2