Fix tests and, now, we can remove the 'settings' from dist package
Add extra cleanup commands to Makefile