Changed some test dirs and added tests for folds.