Cleanup unused folders and unneeded require_once in tests