Fixed Test files setup

-Fixed wrong file name causing wrong fille was copyied.
-Fixed lines to keep 80 lines limit.