Added more tests to the tests folder