fix some tests
remove unused folders