fix asmtest (somehow), update Makefiles