Add tests files and write test (missing 2 tests)