adjusting tests and makefile