Migration to gradle, unit test added