reorganized tests, added files to manifest: