Add cutest
Fix makefiles