Fixed two things in Test folder which were already fixed...