Remove old test
Add header for contexts and models
Add more file extensions to clean
Add .merlin