Fix some issues with the collected files

Also adjusted the tests to check for the right array format now