reverting Makefile changes in test/ since Jenkins keeps failing to build