Fix broken unit test, add skeleton for adapter