Revert "Added test file."

This reverts commit 73693dcae179e8097497e2d5886d16578f9e22d5.
renamed another test file
modified another test file from ricardo branch
resolving a merge conflict.