tweak to makefile options and test cases