Some tests fixed; added test make task