Add testing files
Settle on one single implementation