Cleanup tests

Actually, we don't need to guess the order of the included files since they're sorted alphabetically.