setup tests added and improved, improved matplotlib makefile