Adding tests
Adding tests, fixing names
Moving tests
Added tests for generic file