added tests for folders, reorganized tests