split files and switched to matrix hit tests