modifying some tests and moving files around