Initial commit. Fixded tests in makefile