Removed extraneous/incomplete -Wl option from Makefile, fix test