api stabilising, included basic tests