Add missing files
More test cleanups