Separated villager control to class, created tests