Modified version of the testing files