Arranged tests and cleanup older files