restructured tests files