Include supertest and update Makefile