updated Makefile & tests - troubleshooting