changed tests names
changed makefile