fix up makefiles
add a couple of not-yet working tests
sync