removed make dependency, added tests.