Finish fixing tests. Add a new target in Makefile for testing