Added adapter & tests