cleaned up makefiles; separated out negative tests etc.