Add tests to Makefile
Edited some code according to recommendations by pylint.