Update Makefile
Add tests
Rename lib methods