fixed makefile to use more specific utilities, cleaned test