[FIX, TEST] Fixed a few issues with missing information in files and wrote the tests.