Tidyup/per folder test