Fixing TestError 3 last errors