Merge "API proposal for functest"