Modified bunch of testing files