got all tests passing for real this time, api conversion for returning [cluster msgs & _] complete