Test Makefile
Fix up mock/default.cfg
Fix up mock/default.cfg