Add buildAgenda and test