Remove reference to test layout
Add missing new files