Added some tests
Modified test files