Alright, so I think I have all the files for a better test-dataset, I just need to test them (hopefully tomororw)